merge trunk
authorKenichi Handa <handa@m17n.org>
Wed, 6 Jul 2011 08:07:47 +0000 (17:07 +0900)
committerKenichi Handa <handa@m17n.org>
Wed, 6 Jul 2011 08:07:47 +0000 (17:07 +0900)

Trivial merge